*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d3e2d41ac2fe89de282ecebaf86e7a015448cc9..f18cb0b81dd08365dc9841c6fd2fb6692df84f3f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -45,12 +45,7 @@
 
 2001-10-01  Eli Zaretskii  <eliz@is.elta.co.il>
 
-<<<<<<< ChangeLog
        * help.el (help-for-help): Doc fix.  From Pavel@Janik.cz (Pavel Janik).
-=======
-       * help.el (help-for-help): Doc fix.  From Pavel@Janik.cz (Pavel
-       Jan\e,Bm\e(Bk).
->>>>>>> 1.2772
 
 2001-09-30  Eli Zaretskii  <eliz@is.elta.co.il>